Merge git://git.denx.de/u-boot-marvell
authorTom Rini <[email protected]>
Sun, 28 Jun 2015 20:31:32 +0000 (16:31 -0400)
committerTom Rini <[email protected]>
Sun, 28 Jun 2015 20:31:32 +0000 (16:31 -0400)

Trivial merge